95b026ab1fda6b492d5a0f6d182c2b6d48376478,src/main/java/org/codelibs/elasticsearch/df/content/xls/XlsContent.java,OnLoadListener,onResponse,#SearchResponse#,149

Before Change


                final SearchHits hits = response.getHits();

                final int size = hits.getHits().length;
                logger.info("scrollId: " + response.getScrollId()
                        + ", totalHits: " + hits.totalHits() + ", hits: "
                        + size + ", current: " + (currentCount + size));

                for (final SearchHit hit : hits) {
                    final Map<String, Object> sourceMap = hit.sourceAsMap();
                    final Map<String, Object> dataMap = new HashMap<String, Object>();
                    MapUtil.convertToFlatMap("", sourceMap, dataMap);

                    for (final String key : dataMap.keySet()) {
                        if (modifiableFieldSet && !headerSet.contains(key)) {
                            headerSet.add(key);
                        }
                    }
                    if (appnedHeader) {
                        final Row headerRow = sheet.createRow(currentCount);
                        int count = 0;
                        for (final String value : headerSet) {
                            final Cell cell = headerRow.createCell(count);
                            cell.setCellValue(value);
                            count++;
                        }
                        appnedHeader = false;
                    }

                    currentCount++;
                    final Row row = sheet
                            .createRow(appnedHeader ? currentCount + 1
                                    : currentCount);

                    int count = 0;
                    for (final String name : headerSet) {
                        final Object value = dataMap.get(name);
                        final Cell cell = row.createCell(count);
                        if (value != null
                                && value.toString().trim().length() > 0) {
                            cell.setCellValue(value.toString());
                        } else {
                            cell.setCellValue(DEFAULT_HEADER_COLUMN);
                        }
                        count++;
                    }

                    flushSheet(currentCount, sheet);

                }

                if (size == 0 || disableScroll) {
                    OutputStream stream = null;
                    try {
                        stream = new BufferedOutputStream(new FileOutputStream(
                                outputFile));
                        workbook.write(stream);

                        stream.flush();
                    } finally {
                        if (stream != null) {
                            try {
                                stream.close();
                            } catch (final IOException e) {
                                // ignore
                            }
                        }

                        disposeWorkbook(workbook);
                    }
                    // end
                    listener.onResponse(null);
                } else {
                    client.prepareSearchScroll(response.getScrollId())
                            .setScroll(RequestUtil.getScroll(request))
                            .execute(this);
                }

After Change


                return;
            }

            final String scrollId = response.getScrollId();
            if (isFirstScan()) {
                client.prepareSearchScroll(scrollId)
                        .setScroll(RequestUtil.getScroll(request))
                        .execute(this);
                return;
            }

            try {
                final SearchHits hits = response.getHits();